Nitpicking

Sorry, but I couldn't resist to do tiny refactorings :neckbeard: