Small changes and cleaning up