Updated info and cleaned up code