Cleaned up types. No longer gives warnings with msvc.

Signed-off-by: retep998 <retep998@verizon.net>