Reduced number of objects being created, updated logic for performance