Refactor code section