Small changes, formatting