refactoring js code
refactoring css