Code Organization build 2

Getting rid of anonymous functions is no easy task if you don't
understand what you are doing.