Cleanup. Added shape methods