Better code ^^