Indentation cleaned up