Implements pitch constructor, reorganizes
cleaning
v1.3.1