Space optimizations, add comments.