Cleaned it up, and added more info