Added comments, add consts