refactor code

Created by: eroom1966

@strichmo Hi Steve, just some local refactoring - this should have no effect outside of the module itself all the CI tests pass for me on both E40P and E40X (on this branch)