some cleanup i think