Fixing proxies (broken from refactor)
Minor amounts of formatting