#81 adjusted naming and minor refactoring