don't need this
refactoring, and fixing warnings at /W4