Clean-Up

The current code base was refactored more than once and the terminology changed accordingly. Therefore, many comments and variable names are out of date and should be updated.