Modifications to make it more swifty.