v6.3 Cleaning up the code