clean up logic

Signed-off-by: Noah Campbell <noahcampbell@gmail.com>