Congress: cleaned up style and only triggers on state