little code cleanup and more pins added