A bit cleaner and name fix