refactored for cosistency with the current project styles