Removed shorthand variables which aren't used multiple times.