Clean up and streamline
Remove use of scope to allow documentation tool to list all methods