renamed various things for maintainability and general sanity