refact: clean up code