Some improvements you might be interested in

-> see source :)