Cleanup and better organizing.