Make the code more readable

Lint and comment, change names