Working on API and clean-up