removed magic numberes and added constants
Made small changes, added some scores