Removed $ from javascript var names