Refactoring JavaScript for readability and reuse

Published --