Cleaning day drunk

Some little refactors week