Last bit of code clean-up before proceeding with gameplay implementation.