Renamed 'O6' dir to 'O6_PBC' and removed unneceeary comments and variables