More code, separating the classes