Added comments here and there