Cleaned up design