Codesniff cleanup