getting rid of code dependencies