Cleaning up + XML comments