Refactored

Corrected grammar conditional in Display, Refactored correct_positions