Cleanup and adding request module