Reworked conditions

Made the functions a little clearer