Removed unnecessary libraries, fixed formatting