Better code \o/