next steop should be code cleanup