Minor improvements (less code is always better)