Update timer and Code cleanup

This adds a nice orange update timer, I also made the code not gross. :smile_cat: