js/css code clean-up