Remove superfluous spaces. Add additional comments