Tidy up and JSHinting.