Cleaned up singleton library
Working on code cleaning in controlboard library