Small changes/Clean up