Cleaned up composer