Removed unnecessary shorthands