Renamed, comment, and cleaned