Code cleaned up
Beuetified the library