Cleaning up CV from old comments and fix some alignment