Attempt to make code a bit easier to read...