Code is a little bit cleaner now