Cleaned it up a bit, got rid of unessecary lines