Separate out functionality into other files.
Run git fmt
Fix up reference to methods.
Rename file to reflect functionality.