cleanup unused code, indent