Check and Format

Check and Format the code