Wrap few more methods, cleanup