Cleanup, add rconsole dependency
Refactor
Cleanup