Fixed: code is more readable now.