Tidy up code for release of completed plugin

removed comments