clean indenting and whitespace
change class structure