Fix some camelCase to lower_case in variable/method names
Fix some indentation