better naming and clean up