tiny fix & clean up