Clean src and comments