Code cleanup and simplification

There are no visual changes to the watchface from these commits