Some minor polishing the code