Updated Code to follow C++ Standards

WEEEEEEEEEEEEEEEEEEEEEEEEEE