Removed form objects from manager level
Code beautification