Quackster Futher refactoring of the source code