CSS cleanup
JS cleanup