Style refactor
Javascript refactor