Formatting and short options
Adding pervasive short options