Streamline code; Setup API functions for effects; Update to #2013