-Refactor writing more compact code