Var defs changed, spacing updates
Moving more code into penguin class