Cleaned up code

Linted code, now looks more easy to read.