syntax/log cleanup