Correct license, more readability in code