Removing redundant line
Moved things in view
Sanitized form and cleaned up