Slight code cleanup

TODO: add error handling to request threads