Cleaned up HTML
Refactoring
Updated readme