Streamlined IfStmt and implemented labels in a more consistent way