Slight cleaning up