Added validations

Line is too long. [89/80]