Improve function, Add comment