visual code refactoring
moar refactoring