Feature/cleanup

A few little things.