better naming conventions/organization