indent for after token, relates #351
fixed #256
small cleanup