Formatting and clean-up + shorten aliases