General tidy up.
Merge pull request #1 from adatoo/master-j

General tidy up.