Updated info
cleaned up code a little