Reorganise class for better readability, less variables