finished cleanup of program, removing all weird constants