Moved some method definitions from h file