fixed remaining MSVC warnings
renamed variables for consistency, removed Windows specific functionality