Better separation of concerns between files