Cleaning up sigs... Not quite there