Code Review improvements

removed JS and filters added