Added interactive user reading, small cleanup