main.js cleanup :|