Cleaning up code, no major changes