Cleaned a bit signals code