Add few comments and new lines