Cleaning zebraapi (return conventions etc)