Cleaned up shapes library as well as put through jslint