Refactor code after Chlorine Bump