Cleaned up URL and added library codes