cosmetic changes based on ornicar's code review