Some indentation & style fixes