optimize some less