Formatting
added login
validated