More cleanup; grouped and renamed methods for consistency and clarity.
Cleaned up method names, and made consistent with UI conventions.