V1.2.1

Cleaned up methods from MainForm for readability and flow