Tidied the code for comment plugin.