clean up code [#ff5bd69634fde961b3e181ee4962379c52d3d981]