cleaned up code still passes all