Code formatting tweaks.
Don't like type checking forcing the usage of option. In the future, multimethods will be used.