Eliminating
Moving code to definitions