Applying general advices regarding performance