Trying to clean some things a bit...