cleanup, removing async code from garcon, adjust code styling