Code a little bit cleaner