General code revisions for consistency and cleanliness.