clean codes a little yah