little fix and clear