Cleaned up the advancing of the current piece implementation