Small changes for perfomance