Improved: minor improvements