Clean better code