#50 Even more tweeks and tidy ups.
1. Removed some redundant code.
2. Removed unnecessary usage of 'this'