remove unused comments
method call replacement
format