Fix formatting

Fix some formatting issues. Update .eslintrc with applied rules.