Fixed build and cleaned up a bit

fixed build after some ProjectTox-Core updates
cleaned up the core class a bit