Upate regular expressions for leading whitespaces, Update line comments