Updated some formatting and Param Validation