mostly spacing changes and cleanup