A little bit saner code