Cleaned vars, sitting and thinking on this.