- Fixed a bug with substCount variable which was not being reset. - Re-formatted the whole class to match the rest of the code more closely (still differs, but... :)).