improvements

improvements, less variables, language