Refactored drawing routines and changed pitch extracting settings