Some more refactoring and cleanup. Separated the signals and constants into two places.