Improve peek()