code clean up and identation fix