Refactored all into 1 line