(cleanup) removes unnecessary comments and cleans up code