Getting back into the swing of things with some cleanup