Cleaned up Design