Cleaned up update thread by making sub-methods