I hope this is last minor code refactoring