Code cleanup for readability.