Cleaned-up the libraries to more readable and functional.