Grosser/cleanup

@felipec some small cleanup