Reorderd object initialization and removed unused import