fix style and upped manifest version
tidy up code