Some cleanup and formatting
Move SignType