[PR] Done little optimization