Clean up

Changed to logic to another method