[TW205] - Core/Scripts: Clean up some code and fix up a warning