Made things a bit less redundant.