Code cleanup and maybe optimizations