Removing unnecessary logic for simplicity's sake