Removed more comments and added auto refresh