spruced up regex and got ride of commented out code that was taking up space and looking ugly