Simple improvements & cleanup