Housekeep

(Sorry for the sloppy job off merge #1)

Hope this work helps! :palm_tree: