Cleanup and fixed some method names