Minor changes
Created form abstractions
Refactored code