Cleaned up and made compatible with original lib

Removed uncessary comments. Setup for a pull request for original library.