Cleaned up indenting