Made things more c++ like