cleanup and refactoring
removed unecessary duplication in RandomCanvas
little refactor