Just working on class style issues.