refactor

refactor js objects