minor style cleanups in /script and main.cpp