Code formatting
minor modifications
Escaping the pseudo