Cleaned out files and corrected overflow check