refactoring

@solved replaced for read-ability, #solved? driver test code added