Added form validation

Cleaned up files