Optimized naming & minor optimization