Refactor ical a little