Removed another unused param, more indentation fixes