Clean up code

Moved the comments to the right of the code and condensed the code.
latest commit c801519f57
@PiwwowPants authored