Forgot variable define + cosmetics