Additional Refactoring

[alexdarling]

This will be the last run before I begin organizing & documenting the code

• Consolidated the update() functions so code is shared
• Switching light timers to global variables instead of hardcoding
• Removing an obsolete function