Cleaning up code a little bit.
Cleaning up the current interface.