Constructor instead of clear; removed lots of comments