Cleaned, commented, renamed.