Performed code cleanup

Refactored and cleaned up code. Removed commented out code. Also updated
README.md with current project url.