cleaning up logic