Applying some good practices [ci skip]