Change many things to improve code readablity

Not really done with this, but here is the start of my work. Probably will open more pull requests (if you pull this one).