Fix some code to be more perform