next step of clean up code