cleanup code
use const modifier for strings when appropriate