Shortened return statement

Using the awesome ? operator instead of ifs.