Optimized object creation; some renaming