Added 'unused' suppressions
Removed some magic numbers
Yay recursive splitting!