Making code nicer