Cleaned up so it builds