Cleaned up layout and comments