Added comments and removed the warning