Could this be cleaned up a bit?