Fixed retarded coding styles

Working on converting things to real C++