dev::key module - refactoring