Solved some problems with whitespaces and short evals