Cleaned up render