More readable code, minor improves