Formatting and optimized imports for core-api
Merge pull request #230 from jewzaam/formatting-core-api

Formatting: core-api