Minor refactoring and reformatting.

Removed all ups="" from methods.
Added even more methods.