Initial tidy-around