refactor few elements