Prevented a buffer overflow and made a naming convention