Indentiated code, should be readable now