Cleanup (do not include dependencies)
Simplify UI
Add semicolon in JS