Cleaning this up for actual deployment