Simplify expressions & cleanup debug messages