Remove various mutables etc.

Remove mutables and repetitions.