Cleaned up object creation