Code a bit cleaner