Whitespace
Refactor mkrc a bit