Cleaned up html
Removed JMX annotations
Removed comments
Refactoring