Improvements/cleanup