Cleaned up a few things before abstraction.