Removed unnecessary comments and Lines