Fixed remaining todos bug & indentation