Further code cleanup

[jusdino]

There is still some code-cleanup that needs doing after the v2 update. Review the codebase for:

• lengthy methods that can be broken up
• methods that can be simplified
• logic that might belong better in a different class for improved organization