Clean up & less warnings