Improvements & cleanup