Package: added more keywords
Cleanup lots of whitespace