moving code to better places