Code cleanup, narrowed field visibility