API cleaning/breaking up