Fixed multiple definition errors

Code compiles now