Change indentation of values

Previous indentations will be harder to maintain
Fix amount of variables