Formatted and fixed errors
Revert "Formatted and fixed errors"

This reverts commit e5d8e391c33b4990d7ec117f10a6250f61141371.
Revert "Revert "Formatted and fixed errors""

This reverts commit 64ae922a2827690d3db9662fa3ca5e60c0e94f40.