Final Push, clean code