Fix indentations and add modman