removing useless comments + indentation
remove logins + indentation
refactoring