Some shorthands, some clean ups