Fix for readability. Current code is hard to catch what is doing.