cleaned up indentation level