inf-103 refactoring