Method cleanup and performance enhancements