Clean and format code
Clean and format code
Clean and format code
Minor modifications and code cleaned