Two batches of changes:
1. Some PEP8 improvements.
2. Added support for export of core features only.