some refactoring
VS doesn't save proj file when it should >:(