Little cleanup and tidying