rafactored class indentation