Refactor: shorten some variable and method names
Add comments, some renames