Move the code to make it better