refactor code to be a bit cleaner