Cleanup, Stubs

Just a little bit of cleanup and adding some stub
methods.