little fix & refact