More cleaning up and moving logic to models