Cleaned the framework a little bit.