Code cleanup, performance improvement