cleanup
moved js to public