removing developer API, cleaning up imports
reorganizing code