loggggg
clean up code