major indentation cleanup. no actual functionality