Fit everything on one line and added some comments