JS clean up, + lettering JS