Fixed doco, Refactored inner calls.