Clean up according to angular conventions