Bootstrap file can be generated via generator; minor cleaning