VP-178 Documenting methods and removing debug statements from template