Cleaned up cascade code

Preparing to move cascade to its own .cpp/.h pairing outside the main
method file.