use four-space indentation everywhere
remove some unused commented code