Update and format the code. Focus on Documentation and format