Cleaning up a bit of code in main.cu