Some cleanup and simple code refactoring.  Preparing for full keyboard construction