- Fix unuser method

- Applied coding standards