+ cleaning up code base