Just some minor polishing