clean up some state configuration
use actual users, fix spacing in files