cleanup and better method names