Single class fix. Want to keep the class clean!