Correct indents, modularize Rocket