Cleaned up API

Did some cleanup work