List performance improvement and code clean up