style & js refactored