Cleanup. Mainly docblocks