Reviewed code and cleaned it up