Indentation and style fixes
Better usage message