Major js style cleanup