Cleaning up code again, still not working