Small performance improvement, fix indentation