cleanup
moving code around