Clean up code and function-names

- Remove old, out-commented blocks of code
- Change function-names to make function more clear