cleanup and update (fixes javascript indentation issue)