Fully method based, comments removed, tests successful