Removal of comments and re-styling