Slight optimization of console