got rid of the pointless exit, cause John was right