Refactoring. Mostly deletions of code which was too verbose.