Cleaned up Cell constructor.