Code cleanup, more usage of API functions