Some cleanup and review