Cleaned up and added pertinent info