Cleaned up clientside tick handlers a bit