Slight Clean up