Ctrl Shift F and Little cleanup