Can now insert a method call and a comment. Some clean up refactoring