Updated some files

Ran validations to ensure better code quality