Cleaned up the spacing and adjust the comments