Clean up documentation
Clean up and more readable code
Merge pull request #1 from mhaidarh/master

Just some cleaning up