removed required login
code cleanup/reformating