Spring cleaning

Tom. Keep it neat.