Fixed spacing issues and added more comments