Cleaned up signals a little