Did some initial cleanup/setup