Refactored indentations and operator