Add comments, improve conventions