Readability improvements, renamed a few things to make stuff more clear