Slight clean up