API cleanup and code style changes
API cleanup and code style changes

Zix17/Lychee,windhamdavid/Lychee,electerious/Lychee,windhamdavid/Lychee,electerious/Lychee,electerious/Lychee,Zix17/Lychee,Zix17/Lychee,windhamdavid/Lychee