Refactoring

Removed dependency on MainForm
Removed most of the HINTs on compile